From dcc86ce57cf97d814508b0632a452929655cf604 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 Dec 2007 18:51:25 +0000 Subject: [PATCH] Don't leak pixbufs. (#502250, Yevgen Muntyan) 2007-12-07 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Don't leak pixbufs. (#502250, Yevgen Muntyan) svn path=/trunk/; revision=19128 --- ChangeLog | 5 +++++ gtk/gtkfilechooserdefault.c | 22 ++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ab33a248e..bb9b29eb76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-07 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Don't + leak pixbufs. (#502250, Yevgen Muntyan) + 2007-12-07 Yevgen Muntyan * gtk/gtkprintunixdialog.c: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index fe958b408a..75a149f0e5 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1382,13 +1382,6 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl) volume = data; pixbuf = gtk_file_system_volume_render_icon (impl->file_system, volume, GTK_WIDGET (impl), impl->icon_size, NULL); - - gtk_list_store_set (impl->shortcuts_model, &iter, - SHORTCUTS_COL_PIXBUF, pixbuf, - -1); - - if (pixbuf) - g_object_unref (pixbuf); } else if (shortcut_type == SHORTCUT_TYPE_PATH) { @@ -1425,13 +1418,6 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl) icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl))); pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", impl->icon_size, 0, NULL); - - gtk_list_store_set (impl->shortcuts_model, &iter, - SHORTCUTS_COL_PIXBUF, pixbuf, - -1); - - if (pixbuf) - g_object_unref (pixbuf); } } else if (shortcut_type == SHORTCUT_TYPE_SEARCH) @@ -1442,6 +1428,14 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl) { pixbuf = render_recent_icon (impl); } + + gtk_list_store_set (impl->shortcuts_model, &iter, + SHORTCUTS_COL_PIXBUF, pixbuf, + -1); + + if (pixbuf) + g_object_unref (pixbuf); + } } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model),&iter)); -- 2.30.2